Merge from trunk
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Dec 2011 20:39:45 +0000 (12:39 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 28 Dec 2011 20:39:45 +0000 (12:39 -0800)
commitc219593d2b1edc050e63d079b438122cb717a3d3
tree5ac2fa740bfc41744e663accff13410d28b05616
parent2b81d5d77d27af9e32ecb1ada7c412475e5fe256
parentdf7d1c6a815b4677321d883c7cf0a4e3eb532bf7
Merge from trunk